DIAP-669

Part of DIAP-669