test fix
Merge branch 'section_6_7a' into section_6_8
Merge branch 'section_6_8' into section_7_1