Merge "Bug fix for polymorphic inlining."