Task 10524 - Fix errors  on create folder 
Task 10525 - Fix errors on rename folder