GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4620
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3489