DIAP-337

Part of DIAP-337