TNL-62, TNL-72 and TNL-811
Merge pull request #633 from edx/ammar/tnl72

TNL-72 & TNL-62 & TNL-811