Fixes #18028 Just changes typedef declarations, no logic changes.
Attach a file by drag & drop or click to upload
