Polishing
(cherry picked from commit a31ebb6)