Merge commit 'ea776abca628d855e03c4929da3864985afd8aae' into upstream-merge