Pull in some other changes for CORD
2 files changed