Bring this change from VideoSprint44