Merge "DND related restrictions" into nyc-dev