Merge Hotfix for Show Folder Page