DIAP-599

Part of DIAP-599