DIAP-498

Part of DIAP-498