Merge "Make sure out-of-quota EJs stop in time." into sc-dev