Merge "Remove duplicates in overlay" into nyc-dev