Bug in MJVideo array mapping
Merge conflicts