port from SP3

(bnc#810823)
- 2.24.1