VG-872: Added parameter to allow a folder name