DIAP-287

Part of DIAP-287