Merge "Tweaking input flags for Folder renaming"