Survive new module versions
Merging with upstream