VALG-49 - Corrected merge bug.