Merge and update for XE17