Merge branch 'tests/uploads' into 'develop'