Patch updated to fix the build [CORGI-15158]