Polishing
(cherry picked from commit ede2150)