Polishing
(cherry picked from commit 86ea305)