Merge branch 'bugfix/apc2s_upload_activity' into 'develop'