Feature/kryo 2.22 compat