cherry picked patched files (s/extendable/extensible/g) from Amin Bandali (thanks!)