VID-1156 putting this back in as it was somehow lost in the shuffle
Merge branch 'VideoSprint41' into VID-1316