[SDMF-034] SDMF-034