[SYSDM] Addendum CORE-17429