Merge branch 'master' into qa-copy
video working again :D