DIAP-107

Part of DIAP-107