issue #20456: lock has moved out of the attributes
Merge pull request #514 from shackbarth/20456-lock

issue #20456: lock has moved out of the attributes