Apply latest change from 2.9.x branch.
Change to distribution list