patch-sync from main to dev: <https://github.com/n...