Merge pull request #9841 from cshoredaniel/pr-18.06-nut-targetted
authorRosen Penev <rosenp@gmail.com>
Fri, 30 Aug 2019 17:13:47 +0000 (10:13 -0700)
committerGitHub <noreply@github.com>
Fri, 30 Aug 2019 17:13:47 +0000 (10:13 -0700)
[18.06] Targeted fixes based on 19.07/master


Trivial merge