Cherry pick #565 into release/1.13

Cherry picks the fix for #565 (closed) into release/1.13

Merge request reports

Loading