[CORGI-16953] Updated patches for CORGI-3395 from Richard