#3046 use generated v1beta2 schema