Merge branch 'develop' into VALG-49
VALG-49 - Corrected merge bug.
VALG-49 - CR fix.
Merge branch 'VALG-49' into develop