Merge "Added rate limiter for calibration notification" into sc-dev