Merge pull request #3124 from AndyAyersMS/InlineRefactor3