Backported DevGuide ch 7-10 to 6.1.x

Here are the backported changes for 6.1.x, including the table fixes. Thanks.