Merge tag 'upstream/1.3.91'

Upstream version 1.3.91