DIAP-589

Part of DIAP-589