Merge "Fix build - configure for schema-v4 output"