DIAP-257

Part of DIAP-257