City rflock
See merge request !5766 (merged)
(cherry picked from commit c1359643)
ebb71ed7 Add rflock property. 1e9770ba A bit of cleanup.