DIAP-594

Part of DIAP-594