Merge "Limit when a ranking reconsidering can alert" into oc-dr1-dev