Polishing
(cherry picked from commit 50e50d0)