DIAP-581

Part of DIAP-581