DIAP-465

Part of DIAP-465