Merge branch 'fix/1787-mogrify-args' into 'develop'