zat validate fixes
Merge branch 'j/84' into bevans/requests
zat validate fixes
Merge branch 'bevans/requests' into b/123