The needed build system changes aren't included as those require a newer ECM version than required here.