Merge branch 'bugfix/s3-configuration' into 'develop'