PR: 3251 Suggested by: Thorsten Sch�ning (cherry picked from commit 3ae1b53496acd3f25e9b9089ed5fb6000e41a557)