Final touch
(cherry picked from commit 9d4114e)