Patch from Catalin Marinas

Versatile/AB code after splitting core.c
Versatile/PB code after splitting core.c