DIAP-297

Part of DIAP-297