Merge "Update some behavior when rename file"