Cherry pick PR 1750 to legacy/1.x branch, fix more issues #880
Merged
TylerLeonhardt merged 4 commits intolegacy/1.xfrom Mar 20, 2019
Merged
Cherry pick PR 1750 to legacy/1.x branch, fix more issues #880TylerLeonhardt merged 4 commits intolegacy/1.xfrom
TylerLeonhardt merged 4 commits intolegacy/1.xfrom