Fix doc blocks.
Fix conflicts. Merge.