Duplicate fbf932 changes in proper locations and rebuild docs.