Merge "Revised and addressed vendors' comments" into nyc-dev