Patch to 3.4.86

Change-Id: Ia42e008a2d77bcd82d9c882ef7bbe5cfc2a5ef2c

Signed-off-by: daeiron <thomasvangerven@gmail.com>