Merge for release hotfix on 10/2 for video accessibility to master