Merge pull request #5402 from AndyAyersMS/InlineAllowCpBlk