Add new configuration option
Implement basic configuration merging rules