From a91cfdb777c0a6ac14bed33219369516127a2e82 Mon Sep 17 00:00:00 2001
From: Huon Wilson <huon@exoflare.io>
Date: Fri, 6 Oct 2023 12:32:33 +1100
Subject: [PATCH] Prepare `2.16.1rc3` (#19985)

(cherry picked from commit 0e4917b52d22ff9d6a1555bade2783d4503e5936)
---
 src/python/pants/VERSION         | 2 +-
 src/python/pants/notes/2.16.x.md | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/python/pants/VERSION b/src/python/pants/VERSION
index fee6e358501..0e3da9cb355 100644
--- a/src/python/pants/VERSION
+++ b/src/python/pants/VERSION
@@ -1 +1 @@
-2.16.1rc2
+2.16.1rc3
diff --git a/src/python/pants/notes/2.16.x.md b/src/python/pants/notes/2.16.x.md
index 3fa255ed3b5..c8ca0807e07 100644
--- a/src/python/pants/notes/2.16.x.md
+++ b/src/python/pants/notes/2.16.x.md
@@ -169,10 +169,12 @@ The `ToolCustomLockfile` and `ToolDefaultLockfile` classes [have been removed](h
 
 ----
 
-## 2.16.1rc2 (Sep 23, 2023)
+## 2.16.1rc3 (Oct 06, 2023)
 
 ### Bug fixes
 
+* Support using `__defaults__` in same BUILD file as environment targets. (Cherry-pick of #19446) ([#19968](https://github.com/pantsbuild/pants/pull/19968))
+
 * Add missing `__init__.py` file for the `yamllint` backend. (Cherry-pick of #19899) ([#19908](https://github.com/pantsbuild/pants/pull/19908))
 
 * Add additional directories with register.py to pants bin deps (Cherry pick of #19848) ([#19857](https://github.com/pantsbuild/pants/pull/19857))
@@ -213,6 +215,10 @@ The `ToolCustomLockfile` and `ToolDefaultLockfile` classes [have been removed](h
 
 * Visibility: documentation fixes and clarifications. (Cherry-pick of #19438) ([#19495](https://github.com/pantsbuild/pants/pull/19495))
 
+## 2.16.1rc2 (Sep 23, 2023)
+
+Never released due to build issues.
+
 ## 2.16.1rc1 (Sep 20, 2023)
 
 Never released due to build issues.