Merge remote-tracking branch 'refs/remotes/origin/Bugfixes' into dev
Minor logging changes
Merge remote-tracking branch 'refs/remotes/origin/Cosmetic' into dev