DIAP-044

Part of DIAP-044