CHANGE: Changes for deep configuration merge