Polishing
(cherry picked from commit 16325c2)