Got part of the documentation done.
Merge remote-tracking branch 'origin/team1-stable2' into team1-stable2