Merge branch 'hotfix/1.11.4'
Add support for checking if the uploaded image is too small
Merge branch 'hotfix/1.11.5' into develop