Merge branch 'master' into mrst-video