DIAP-591

Part of DIAP-591