Merge branch 'jk/quarantine-received-objects'