Merge branch '3913_safe_overwrite'