Module_gbp issue from 4.0-dev.