Merge 4_X changes back to 5_X (#479)

This is a cherry-pick PR which merges newer 4_X engine commits into 5_X.
Task: No-JIRA
Signed-off-by- Roshan Kanwar <rskanwar.amazon.com>

.github/scripts/create-tag.sh

@@ -37,9 +37,9 @@ fi
 
 # check the tag format (need manual update when necessary)
 format=BABEL_
-if ! [[ "$new" =~ "$format"[0-9]_[0-9]_[0-9]__"PG"_[0-9]+_[0-9] ]]
+if ! [[ "$new" =~ "$format"[0-9]_[0-9]+_[0-9]__"PG"_[0-9]+_[0-9]+ ]]
 then
-    echo "Error: Invalid tag prefix, expected: ${format}<digit>_<digit>_<digit>__PG_<number>_<digit>"
+    echo "Error: Invalid tag prefix, expected: ${format}<digit>_<number>_<digit>__PG_<number>_<number>"
     exit 1
 fi
 

src/backend/optimizer/plan/planner.c

@@ -1182,6 +1182,10 @@ preprocess_expression(PlannerInfo *root, Node *expr, int kind)
 	if (kind != EXPRKIND_RTFUNC)
 		expr = eval_const_expressions(root, expr);
 
+	/* Reset context of expression */
+	if(EXPRKIND_TARGET == kind && planner_node_transformer_hook)
+		(void) planner_node_transformer_hook(root, NULL, -1);
+
 	/*
 	 * If it's a qual or havingQual, canonicalize it.
 	 */