DIAP-118

Part of DIAP-118