Added fix for issue #3985
Merge branch 'directory-rename-error-fix' into linux-build
Submodule update
Merge branch 'jasonsanjose/linux' into linux-build