Update to core 3.8