Merge branch 'revert-e2bedb70' into 'master'

Revert "Add some statement to Locking."

See merge request !229
2 jobs for master in 1 minute and 52 seconds (queued for 1 second)