DIAP-109

Part of DIAP-109