DIAP-585

Part of DIAP-585