Update branch for people
Merge pull request #6203 from dlaz/patch-4

Update branch for people