Imported Upstream version 1.7.36
Merge tag 'upstream/1.7.36'

Upstream version 1.7.36