DIAP-590

Part of DIAP-590