Merge "Add the ability to use schema-aware coding"