Build: Keep support for core 1.8