Merge "Added and updated Doxygen comments in content handler and diff namespaces"