DIAP-068

Part of DIAP-068