MA-135: Fix movie player

MA-135 #resolve #comment Ready for review
Merge branch 'MA-135' into dev