DIAP-108

Part of DIAP-108