Original PRs/commits:

* https://github.com/bazelbuild/bazel/pull/22017
* https://github.com/bazelbuild/bazel/pull/22213
*
https://github.com/bazelbuild/bazel/commit/81117aabe22f615743a2fe01548f9764dcad8a63



---------

Co-authored-by: Mark Elliot <123787712+mark-thm@users.noreply.github.com>
Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>