Patch from 3.4.99 > 3.4.100

Change-Id: If5878cdbadd78a3092784ae6c597f4dacb8c55c9