Updated core to 7.22