Pick/41079/release 4.0#41204

Merged

DanielRosenwasser merged 2 commits intorelease-4.0from

pick/41079/release-4.0

Oct 22, 2020

Commits on Oct 22, 2020

Cherry-pick PR #41079 into release-4.0

elibarzilay
authored and
typescript-bot
committed
Accepted baselines.
DanielRosenwasser
committed