DIAP-379

Part of DIAP-379