EX-81 / Ex-84 changes
Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue

EX-81 / Ex-84 changes