Check in parts of the new scalable kernel