Important to backport this to Icehouse because icehouse compute will start using this code path if you update your conductor to Juno
Important to backport this to Icehouse because icehouse compute will start using this code path if you update your conductor to Juno