Merge branch 'refs/heads/dev' into Logging
Merge remote-tracking branch 'refs/remotes/origin/master' into Logging