DIAP-568

Part of DIAP-568