Merge branch 'hotfix/update_video_url'
Merge branch 'release/almostspring'
Fix #1431
Merge branch 'hotfix/fix_1431' into develop