Merge feature SOL-20

This is a pull request to merge the SOL-20 feature (https://openedx.atlassian.net/browse/SOL-20).
Totally agree with @cptvitamin's suggestion. If you are able to make the changes, that would be great.