DIAP-490

Part of DIAP-490