Merge branch 'stable-2.9' into stable-2.10

Change-Id: I10cd238a13b81198f4688e03b0c3827ab1d9b403