Ajay | #2229 | Fixing build - Commenting out DS index creation for now