Merge chapter 9 changes