Merge branch 'tp/logfix_S1043352' into ibm_next_tmp