Diff support update to unstable