Fixed video issue
Merge branch 'development'