Merge branch 'feat/client-uploader' into 'master'