DIAP-069

Part of DIAP-069