DIAP-693

Part of DIAP-693