Merge pull request #7665 from julialongtin/safe_changes