MDL-42629 course: management resorting improvements