Backport fix for XSTR-739