Merge remote-tracking branch 'upstream/master' into b_3_89

Merge branch 'master' into b_3_87 (hmapps-64bb828)

Merge branch 'master' into b_3_87

Updated to version 3.87.6 (3.85.X RC 6)

Merge branch 'master' into b_3_87 (3.87.6)

Merge branch 'master' into b_3_87 (3.87.4)

Merge branch 'master' into b_3_87 (3.87.3)

Merge branch 'master' into b_3_87 (3.87.2)

Merge branch 'master' into b_3_87 (3.87.1)

Merge branch 'master' into b_3_85