Merge branch 'bugfix/trans_fix_url_videos' into 'develop'