Polishing
(cherry picked from commit b559f15)