Pre-core update

6124