Polishing
(cherry picked from commit 730bd02)