Issue pull request for branch linux-62277020

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