DIAP-361

Part of DIAP-361