Merge "Improve ApplicationGuide"