Polishing
(cherry picked from commit d6be433)