CDB-3103 Relaxed Permissions requirement
Merge branch 'CDB-3103' into CDB-2891