Merge "Update stable branch jobs"