Code review fixes
Merge commit 'acc0f81e725340847d16e5b02b2e619dcc828bac' into TextboxPullRequest