Tweaks to merging configuration from cloud