Chapter 2: Revisions to 2.23.11, 2.23.40

Bill #18-19-34