Added recent changes to core 32.