VID-1922 Merged up VideoSprint57