Polish
(cherry picked from commit 4328c43)