Could you please consider the attached patch for the next release.
 
Thank you
Markus

Note: forwarded message attached.