DIAP-598

Part of DIAP-598