DIAP-262

Part of DIAP-262