[SDNM-489] SDNM-489