DIAP-344

Part of DIAP-344