Moved to core 1.12