cherry pick feature/captions into release-6.9