Revert "Revert "Merge pull request #2593 from redconfetti/CLC-3708-add-people-style-fix""

This reverts commit 93c9cfea2f4c7914eb196a8aad6d7a412b0e1362.