Hopefully final changes for this fix with executionClusterId