Fixed issue where params object is replaced with a new one. Messes up the editor.
Merge branch 'api-1.1' into api-1.2
Merge branch 'api-1.2' into cp-1.1