Merge "Fix rename bug via FUSE" into mainline-prod