Porting commit on master to v0.18 for tomorrow's canary fix

[vishalchangrani]

Fix from this PR ported over to brach v0.18

git cherry-pick 934f8b122ccf3553b866c54a3fc036072be426f1

[codecov-commenter]

Codecov Report

❗ No coverage uploaded for pull request base (v0.18@10ca730). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 934f8b1 differs from pull request most recent head 00baa6d. Consider uploading reports for the commit 00baa6d to get more accurate results

@@           Coverage Diff            @@
##             v0.18     #841   +/-   ##
========================================
  Coverage         ?   56.53%           
========================================
  Files            ?      427           
  Lines            ?    25112           
  Branches         ?        0           
========================================
  Hits             ?    14196           
  Misses           ?     9000           
  Partials         ?     1916           

Flag	Coverage Δ
unittests	56.53% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 10ca730...00baa6d. Read the comment docs.

[vishalchangrani]

Closing PR - fix not needed on this branch as the Canary 5.5 will be off of current master which already has this change.