Bump core to 7.22

Bump core to 7.22