Polishing
(cherry picked from commit 4db258b)