Merge branch 'tp/ibm_next_20_logging_facility' into ibm_next_20_tmp