Merge branch 'fix/1924-s3-descriptions' into 'develop'