DIAP-683

Part of DIAP-683