Updated Folder class #3918 only for master-2.5