DIAP-259

Part of DIAP-259