Created by: Kelvin-Lee
No test plan. Cherrypicked some commits from a different PR and added some punctuation-related ones) because CLA bot isn't happy with me?