Issue pull request for branch foo-52176201

[Delivers #52176201](https://www.pivotaltracker.com/story/show/52176201)