FIX: DEV: Lock-on improvements (PR #10448)

Commits tell everything:

before/after

before

after

GitHub

1 Like

Looking good!