Polishing
(cherry picked from commit a3a4344)