WL-115

WL-115 improvements
Merge pull request #5947 from edx/asadiqbal08/WL-115

WL-115