DIAP-264

Part of DIAP-264