Merge "Bug fix for polymorphic inlining." into nyc-dev