backport of SP3 fix

- 2.24.0