Added comments in DocGen.
Merge origin/master