gf4a
gf4b
Merge branch 'feature/gf4a' into develop

Conflicts:
	ReleaseNotes