DIAP-261

Part of DIAP-261