Merge branch 'tp/state-lock' into ibm_next_20_tmp