DIAP-355

Part of DIAP-355