Polishing
(cherry picked from commit 52cca48)