Update master to core 1.10.2