Merge pull request #1191 from SimonPe/patch-3
(MODULES-11099) Make merge parameter data types actually backwards compatible