DIAP-429

Part of DIAP-429