Part of https://github.com/adaptlearning/adapt_framework/issues/3643
Part of adaptlearning/adapt_framework#3643