Merge "Update jobs for Istanbul branch"