port from SP3

- 2.24.1