Merge "Improve ApplicationGuide"

No match.