Merge pull request #11091 from BruceForstall/BlockRefactor