Merge pull request #3888 from sigurdm/cherry_pick_to_3

Merge cherry pick