Fix rFile
Merge remote-tracking branch 'origin/pr/571'