Version 2.17.4

* Cherry-pick refs/changes/32/247332/1 to stable
* Cherry-pick a801368f80f85553682816c67c9e7dc3ea90337d to stable
* Cherry-pick refs/changes/61/249161/2 to stable
diff --git a/tools/VERSION b/tools/VERSION
index a2075a5..f9aa7cc 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 17
-PATCH 3
+PATCH 4
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file