Merge branch 'feature/media-description' into 'develop'