Merge branch 'tp/fix_utils_rpmv2' into ibm_next_2Xmerge_tmp