Merge branch 'tp/lock.upcall' into ibm_next_20_tmp