Code review fixes
Merge commit 'b19a4c6959c48240e288729e6d05dad9a51d8bcd' into TextboxPullRequest