Merge "Exclude autogrouping from rate limiter" into oc-mr1-dev