Late configuration update/merging fixed
Authored by: bloehr 2016-02-04
Parent: [r1505]
Child: [r1507]