Merge main into fu/integration after PR #18 landed

main now holds sync/upstream-step4 through the PR #18 merge (5303a77),
whose tree is identical to 4061125. fu/integration already contains
4061125, so this merge adds no content; it records main as an ancestor
so the fu/integration -> main PR has a single merge base.

Author: ngallodev