fix  merge of configurations defined in different configs.
Merge branch '0.5'