DIAP-597

Part of DIAP-597