Merge pull request #18465 from totten/master-greenwich-ext