Resolve #3534948 "Content lock configuration"

Alex Pottrequested to merge
issue/content_lock-3534948:3534948-content-lock-configuration into 3.x

Closes #3534948

Merge request reports