master
Fix declarative validation and defaulting tests
Update generated declarative validation code and tests