[ros-diffs] [janderwald] 22193: re-enable lock