BZ1118345: Roll up patch DV_6.0_4_2014