Code review changes.
Merge commit '77d11785597c8ea34c7600b3b8eb5e1db19b1bd0' into TextboxPullRequest