DIAP-265

Part of DIAP-265