Merge branch 'subtitles-rework'