Finishing chapter 7
Merge branch 'operational_chapter6'