Merge remote-tracking branch 'refs/remotes/origin/master' into BS-6672_Log_enhancements