DIAP-579

Part of DIAP-579