TEIIDDES-2110 Upgrades to chapters 9, 10 and Appendix D