DIAP-308

Part of DIAP-308