Upgrade core to latest commits - 21a11cf58fee8a79d247b212084e8d72ab2b2ed4