Merge "only rate limit notification updates" into nyc-mr1-dev