diff --git a/CHANGES.md b/CHANGES.md
index 690cb44947c..6c43af3c9b2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,73 @@
-->
# PHOENIX Changelog
+## Release 5.1.2 - Unreleased (as of 2021-05-30)
+
+
+
+### IMPROVEMENTS:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6444](https://issues.apache.org/jira/browse/PHOENIX-6444) | Extend Cell Tags to Delete object for Indexer coproc | Major | core |
+| [PHOENIX-6357](https://issues.apache.org/jira/browse/PHOENIX-6357) | Change all command line tools to use the fixed commons-cli constructor | Major | core |
+| [PHOENIX-6422](https://issues.apache.org/jira/browse/PHOENIX-6422) | Remove CorrelatePlan | Minor | core |
+| [PHOENIX-6435](https://issues.apache.org/jira/browse/PHOENIX-6435) | Fix ViewTTLIT test flapper | Blocker | . |
+| [PHOENIX-6434](https://issues.apache.org/jira/browse/PHOENIX-6434) | Secondary Indexes on PHOENIX\_ROW\_TIMESTAMP() | Major | . |
+
+
+### BUG FIXES:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6479](https://issues.apache.org/jira/browse/PHOENIX-6479) | Duplicate commons-io dependency in phoenix-pherf | Trivial | . |
+| [PHOENIX-6475](https://issues.apache.org/jira/browse/PHOENIX-6475) | Build failure on Linux ARM64 | Major | core |
+| [PHOENIX-6420](https://issues.apache.org/jira/browse/PHOENIX-6420) | Wrong result when conditional and regular upserts are passed in the same commit batch | Major | . |
+| [PHOENIX-6471](https://issues.apache.org/jira/browse/PHOENIX-6471) | Revert PHOENIX-5387 to remove unneeded CPL 1.0 license | Blocker | . |
+| [PHOENIX-6442](https://issues.apache.org/jira/browse/PHOENIX-6442) | Phoenix should depend on the appropriate tephra-hbase-compat-x.y module | Major | core, tephra |
+| [PHOENIX-6437](https://issues.apache.org/jira/browse/PHOENIX-6437) | Delete marker for parent-child rows does not get replicated via SystemCatalogWALEntryFilter | Major | core |
+| [PHOENIX-6351](https://issues.apache.org/jira/browse/PHOENIX-6351) | PhoenixMRJobUtil getActiveResourceManagerAddress logic fails on pseudodistributed cluster | Minor | core |
+| [PHOENIX-6447](https://issues.apache.org/jira/browse/PHOENIX-6447) | Add support for SYSTEM.CHILD\_LINK table in systemcatalogwalentryfilter | Major | core |
+| [PHOENIX-6452](https://issues.apache.org/jira/browse/PHOENIX-6452) | cache-apache-client-artifact.sh stopped working | Critical | core |
+| [PHOENIX-6427](https://issues.apache.org/jira/browse/PHOENIX-6427) | Create sequence fails in lowercase schema | Major | core |
+| [PHOENIX-6424](https://issues.apache.org/jira/browse/PHOENIX-6424) | SELECT cf1.\* FAILS with a WHERE clause including cf2. | Major | . |
+| [PHOENIX-6421](https://issues.apache.org/jira/browse/PHOENIX-6421) | Selecting an indexed array value from an uncovered column with local index returns NULL | Major | . |
+| [PHOENIX-6423](https://issues.apache.org/jira/browse/PHOENIX-6423) | Wildcard queries fail with mixed default and explicit column families. | Critical | . |
+| [PHOENIX-6419](https://issues.apache.org/jira/browse/PHOENIX-6419) | Unused getResolverForQuery() in QueryCompiler.verifySCN() | Trivial | core |
+
+
+### TESTS:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6483](https://issues.apache.org/jira/browse/PHOENIX-6483) | Flakes in BasePermissionsIT and AuditLoggingIT | Major | . |
+| [PHOENIX-6482](https://issues.apache.org/jira/browse/PHOENIX-6482) | PherfMainIT#testPherfMain is consistently failing | Major | . |
+
+
+### SUB-TASKS:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6417](https://issues.apache.org/jira/browse/PHOENIX-6417) | Fix PHERF ITs that are failing in the local builds | Minor | . |
+| [PHOENIX-6118](https://issues.apache.org/jira/browse/PHOENIX-6118) | Multi Tenant Workloads using PHERF | Major | . |
+| [PHOENIX-6429](https://issues.apache.org/jira/browse/PHOENIX-6429) | Add support for global connections and sequential data generators | Major | . |
+| [PHOENIX-6430](https://issues.apache.org/jira/browse/PHOENIX-6430) | Add support for full row update for tables when no columns specfied in scenario | Major | . |
+| [PHOENIX-6431](https://issues.apache.org/jira/browse/PHOENIX-6431) | Add support for auto assigning pmfs | Major | . |
+| [PHOENIX-6432](https://issues.apache.org/jira/browse/PHOENIX-6432) | Add support for additional load generators | Major | . |
+
+
+### OTHER:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6436](https://issues.apache.org/jira/browse/PHOENIX-6436) | OrderedResultIterator overestimates memory requirements. | Major | . |
+| [PHOENIX-6456](https://issues.apache.org/jira/browse/PHOENIX-6456) | Support query logging for DDL and DML | Major | core |
+| [PHOENIX-6451](https://issues.apache.org/jira/browse/PHOENIX-6451) | Update joni and jcodings versions | Major | . |
+| [PHOENIX-6446](https://issues.apache.org/jira/browse/PHOENIX-6446) | Bump default HBase version on 2.3 profile to 2.3.5 | Major | . |
+| [PHOENIX-6418](https://issues.apache.org/jira/browse/PHOENIX-6418) | Bump default HBase version on 2.4 profile to 2.4.2 | Major | . |
+
+
+
## Release 5.1.1 - Unreleased (as of 2021-03-16)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1d085df811b..2a285e2ac87 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-->
+# PHOENIX 5.1.2 Release Notes
+
+These release notes cover new developer and user-facing incompatibilities, important issues, features, and major improvements.
+
+
+---
+
+* [PHOENIX-6357](https://issues.apache.org/jira/browse/PHOENIX-6357) | *Major* | **Change all command line tools to use the fixed commons-cli constructor**
+
+Fixed command line parsing of double quoted identifiers.
+The previous workaround of using double doublequotes as a workaround is no longer supported.
+
+
+
# PHOENIX 5.1.1 Release Notes
These release notes cover new developer and user-facing incompatibilities, important issues, features, and major improvements.
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index cba11bf9438..fda1968b54e 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-assembly
Phoenix Assembly
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml
index 89edf5d8c72..f1108981f69 100644
--- a/phoenix-client-parent/phoenix-client-embedded/pom.xml
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix-client-parent
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-client-embedded-${hbase.suffix}
diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml
index cbb0da59ef3..0f99cf33d88 100644
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ b/phoenix-client-parent/phoenix-client/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix-client-parent
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-client-${hbase.suffix}
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 856ba10dec2..f23c2c37442 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-client-parent
Phoenix Client Parent
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 24755656a37..ff6a572709f 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -21,7 +21,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-core
Phoenix Core
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml b/phoenix-hbase-compat-2.1.6/pom.xml
index 2778545d33e..00cbc6ce977 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -23,7 +23,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-hbase-compat-2.1.6
diff --git a/phoenix-hbase-compat-2.2.5/pom.xml b/phoenix-hbase-compat-2.2.5/pom.xml
index 2516a45f279..82ca41b8314 100644
--- a/phoenix-hbase-compat-2.2.5/pom.xml
+++ b/phoenix-hbase-compat-2.2.5/pom.xml
@@ -23,7 +23,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-hbase-compat-2.2.5
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml b/phoenix-hbase-compat-2.3.0/pom.xml
index cc3373a2385..8499cd66d94 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -23,7 +23,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-hbase-compat-2.3.0
diff --git a/phoenix-hbase-compat-2.4.0/pom.xml b/phoenix-hbase-compat-2.4.0/pom.xml
index 9f90748449f..146906ff12c 100644
--- a/phoenix-hbase-compat-2.4.0/pom.xml
+++ b/phoenix-hbase-compat-2.4.0/pom.xml
@@ -23,7 +23,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-hbase-compat-2.4.0
diff --git a/phoenix-hbase-compat-2.4.1/pom.xml b/phoenix-hbase-compat-2.4.1/pom.xml
index bd3f07be717..de397d86936 100644
--- a/phoenix-hbase-compat-2.4.1/pom.xml
+++ b/phoenix-hbase-compat-2.4.1/pom.xml
@@ -23,7 +23,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-hbase-compat-2.4.1
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 5cbc778f44a..7c4bf8278bb 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-pherf
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index bd585815c1a..30941234dee 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -24,7 +24,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-server-${hbase.suffix}
Phoenix Server JAR
diff --git a/phoenix-tools/pom.xml b/phoenix-tools/pom.xml
index a3c318aeeb4..f102e9dead7 100644
--- a/phoenix-tools/pom.xml
+++ b/phoenix-tools/pom.xml
@@ -23,7 +23,7 @@
phoenix
org.apache.phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
4.0.0
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index dfbc07725d9..080e40de1f3 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -22,7 +22,7 @@
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
phoenix-tracing-webapp
diff --git a/pom.xml b/pom.xml
index b011eac55c4..b0a36925ed5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.apache.phoenix
phoenix
- 5.1.2-SNAPSHOT
+ 5.1.2
pom
Apache Phoenix
A SQL layer over HBase