Core upgrade to 2.3