Merge branch 'tp/jv_simplefix1' into ibm_next_2Xmerge_tmp