Merge tag 'upstream/1.3.90'

Upstream version 1.3.90