DIAP-239

Part of DIAP-239