DIAP-338

Part of DIAP-338