Merge branch '66-with_items-deprecation' into orgsafe

2 jobs for orgsafe-dev in 1 minute and 16 seconds (queued for 1 second)