Merge branch 'stable-3.9' into master

Change-Id: I0816eacb94e8f3301e1f11866ad014bde05a7bd9