Merge branch 'tp/owner.check' into ibm_next_20_tmp