Update to core update next 2