@Martin, Given that Jeyan verified the fix in master, please cherry-pick the change to r/stx.2.0 asap.
@Martin, Given that Jeyan verified the fix in master, please cherry-pick the change to r/stx.2.0 asap.