Framework Merge #2461: Implemented a fix regarding folders showing under a file treedropdown.