Merge branch 'rs/lock-correct-ref-during-delete' into maint