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