Imported Upstream version 31.0
Merge tag 'upstream/31.0'

Upstream version 31.0
rebuild patch queue from patch-queue branch