Imported Upstream version 7.36.5
Merge tag 'upstream/7.36.5'

Upstream version 7.36.5
7.36.5