Merge branch 'tp/S1041818-fix-name-len' into ibm_next_tmp