Merge "Introducing simple merge strategy for config subsystem"