diff --git a/CHANGES.txt b/CHANGES.txt
index f01c312..8f1fd9f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,8 @@
  
 INCOMPATIBLE CHANGES
 
+PIG-5085: Support FLATTEN of maps (szita via rohini)
+
 PIG-4728: Compilation against hbase 1.x fails with hbase-hadoop1-compat not found (szita via rohini)
 
 PIG-4897: Scope of param substitution for run/exec commands (knoguchi)
@@ -38,8 +40,6 @@
 
 PIG-5110: Removing schema alias and :: coming from parent relation (szita via rohini)
 
-PIG-5085: Support FLATTEN of maps (szita via rohini)
-
 PIG-5126. Add doc about pig in zeppelin (zjffdu)
 
 PIG-5120: Let tez_local mode run without a jar file (knoguchi)
@@ -91,6 +91,8 @@
  
 BUG FIXES
 
+PIG-5153: Change of behavior in FLATTEN(map) (szita via rohini)
+
 PIG-4677: Display failure information on stop on failure (rohini)
 
 PIG-5198: streaming job stuck with script failure when combined with split (knoguchi)
diff --git a/test/e2e/pig/tests/nightly.conf b/test/e2e/pig/tests/nightly.conf
index fe5b447..2194946 100644
--- a/test/e2e/pig/tests/nightly.conf
+++ b/test/e2e/pig/tests/nightly.conf
@@ -1037,6 +1037,10 @@
 a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
 b = foreach a generate flatten(name) as n, flatten(org.apache.pig.test.udf.evalfunc.CreateMap((chararray)name, gpa)) as m;
 store b into ':OUTPATH:' using org.apache.pig.test.udf.storefunc.StringStore();\,
+			'verify_pig_script' => q\register :FUNCPATH:/testudf.jar;
+a = load ':INPATH:/singlefile/studenttab10k' as (name, age, gpa);
+b = foreach a generate flatten(name) as n, name as m::key, gpa as m::value;
+store b into ':OUTPATH:' using org.apache.pig.test.udf.storefunc.StringStore();\,
 			},
 			{
 			# test flatten for UDF that returns bag with multiple tuples with multiple columns