Apply !133 to v0.6-preview
What?
This MR applies the fix from !133 (merged) to the v0.6-preview.
Why?
Describe briefly why this MR is required.
This MR applies the fix from !133 (merged) to the v0.6-preview.
Describe briefly why this MR is required.