DIAP-558

Part of DIAP-558