re-adding some code to our dev branch after it was lost in a merge commit
Merge branch 'VideoSprint60' into VID-2089-2