Ported RootFolder fix from WE2013