Bringing core up to date with 2.3.1