am 6c368d28: Merge "Fix build - configure for schema-v4 output"

* commit '6c368d28f57a45e8310fa0a8cdea240a42c2555e':
  Fix build - configure for schema-v4 output