Merge branch 'kg/external-diff-save-env'