Merge branch 'topic/ctl-pid-lock' into topic/core-change