Merge branch 'sandbox/knimitz/lock_mv_transition_endD' into sandbox/knimitz/lock