DIAP-674

Part of DIAP-674