Merge pull request #15966 from weshaggard/MoveTo21Preview2