New patch 08_doubleextensions.patch, kindly backported and provided by