3.7.0: Docs enhancement
Merge origin/dev into dev