Configurable function for config merge
Merge branch 'custom-merge' into mix