DIAP-296

Part of DIAP-296