Version 2.12.3

* Cherry-pick ce5a1c2392debce967415d4c09359ff2555e3588 to stable
* Cherry-pick adc36a6563614a7c3ba29d9911e57fc68e7d9ac0 to stable
diff --git a/tools/VERSION b/tools/VERSION
index ec4c8b7..6f1acdf 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 12
-PATCH 2
+PATCH 3
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file