Polishing
(cherry picked from commit 8c700b1)