DIAP-428

Part of DIAP-428