DIAP-458

Part of DIAP-458