Moved to core 1.11