DIAP-385

Part of DIAP-385