Leah Rowe d89e0ec857 Backport changes to master branch %!s(int64=8) %!d(string=hai) anos
..
helpers d89e0ec857 Backport changes to master branch %!s(int64=8) %!d(string=hai) anos
misc d89e0ec857 Backport changes to master branch %!s(int64=8) %!d(string=hai) anos