Fixes #737 (cherry picked from commit 056443ccbd)
056443ccbd
extensions
(cherry picked from commit e1535d2bd8)
e1535d2bd8