Merge branch 'cycles-uploader' into 'develop'