Merge tag 'upstream/0.11.90'

Upstream version 0.11.90