Merge doc updates. Closes [2e658da]