Merge "Reducing overhead of job constraint evaluation."