https://openedx.atlassian.net/browse/ARCH-2219