DIAP-253

Part of DIAP-253