DIAP-273

Part of DIAP-273