Merge "Work on issue #27381069: Master tracking bug: NYC is Sluggish" into nyc-dev