DIAP-425

Part of DIAP-425