DIAP-269

Part of DIAP-269