Resuming video to the last position done (have to fix an issue)
Merge origin/sprint1.5 into sprint1.5