Changes to match original
Changes to match original

Also reflow. While checking #3744. None of the deprecated methods were actually included.

tbrowder/doc,tbrowder/doc,MasterDuke17/doc,MasterDuke17/doc,tbrowder/doc,tbrowder/doc,MasterDuke17/doc,MasterDuke17/doc