DIAP-488

Part of DIAP-488