WP-3405-2 Removed field_prefix_non_degree_course and field_prefix_teaching_materials