Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'