DIAP-378

Part of DIAP-378