Merge "Refactor stable branch jobs"