rename folder support (AI-661)
Merge remote-tracking branch 'origin/master'