Merge branch 'tp/S1047125_logging_enhancements' into ibm_next_tmp
Merge branch 'tp/S1046286' into ibm_next_tmp