Merge pull request #52 from ajtowns/202404-inq27-backports #44

Job	Run time
Win64 native, VS 2022	35m 52s
macOS 13 native, x86_64, no depends, sqlite only, gui	30m 2s
test each commit	0s
	1h 5m 54s

Provide feedback