Updating with changes from doc branch.