Hotfix for zoom param handling
Merge branch 'hotfix/REL_1.17.1'