Merge branch 'uploader-controller' into 'develop'