Part 1
Part 2
Rebase 3 part 3
Merge branch 'feature/Rebase3' into develop

Conflicts:
	CodeFile.cs