upstream/8.18_git20220110

Victor Westerhuis

@viccie30

ce4ccc66 · Handle new UsingType · Jan 10, 2022

Upstream version 8.18~git20220110