Merge branch 'richmedia-workaround' into 'develop'