DIAP-088

Part of DIAP-088