DIAP-373

Part of DIAP-373