Mergeing release back into develop for hotfix to fix lecture video exceptions

Mergeing release back into develop for hotfix to fix lecture video exceptions