Updated core to 7.21