Merge pull request #4423 from sigurdm/merge_cherry_pick

Merge cherry pick