DIAP-442

Part of DIAP-442