test fix
Merge branch 'section_6_7a' into section_6_8