DIAP-587

Part of DIAP-587