Log Message: Update to 2.17 Upstream changes: 2.17 2023-11-13 [INTERNALS] - replace use vars with our (GH #23, thanks to mauke)