Merge branch 'stable-2.8'

Change-Id: I52d121c1f2323969f438286c4239ec65b0b55895