Merge tag 'upstream/0.11.99'

Upstream version 0.11.99