Add an extra log message for file rename to improve log readability
Merge branch 'driskell' into driskell_merge_pr164