Fix parameter merge logic to deep_merge.
Merge branch 'develop' into test/run