WG, MF: 179300, 179334

Change-Id: I73a1c68811ffbef22d71f4b8e34dc1e20fce54be
Merge "WG, MF: 179300, 179334" into wmf/1.25wmf11