Merge "[validation] Improve relationship between jobs"