Merge "Fix verify config API version checks"