Merge "Fix execution capping." into sc-dev