Imported Upstream version 1.3.6.9
Merge tag 'upstream/1.3.6.9'

Upstream version 1.3.6.9