Make max shape sizes more liberal
Merge branch 'master' into hotfix-make-shape-max-sizes-larger
Merge branch 'hotfix-make-shape-max-sizes-larger'