v4.10-9505-beta
Merge remote-tracking branch 'upstream/master'