Merge "Ensure DO/PO are also DA." into nyc-dev