Merge branch 'master' into emi-branch
Merge branch 'master' into emi-branch
Some video/close text box fixes
still debugging i.e.
Merge branch 'emi-branch'
Merge branch 'emi-branch'