reapplication of some lost commits for new degree type and focus issue