Refs #9431 UB to log
Merge remote-tracking branch 'origin/feature/9431_UB_to_log'