Pants 2.17.0rc5 is now available! To upgrade, set pants_version="2.17.0rc5" in the [GLOBAL] section of your pants.toml. We hope to make this the 2.17.0 stable release, so please do test it out in your repos. Thanks to all the contributors to this release!

Can confirm my issues are resolved.