Merge "Update Jack options to enable invoke-polymorphic"