Polishing
(cherry picked from commit 50c578c)