Master hotfix
Merge branch 'master' into uat

* master:
  Master hotfix

Conflicts:
	CodeFile.cs