OC-265:Fix Situation when renaming a folder does not work correctly