DIAP-451

Part of DIAP-451