Merge "update dac legacy templates for N release." into nyc-dev