Merge branch 'bugfix/upload-limit-plug' into 'develop'