Merge branch '1865-media-only' into 'develop'