Fixed NullReferenceException on file/folder move
Merge branch 'rc/2.0.0'