[RCD] #1267231 Folder hierarchy collapsing