prep for xquery builds
12 files changed