Merge branch 'tp/new_handle_change' into ibm_next_tmp