PR: #570 Submitted by: Martin Witzel <MWITZEL@de.ibm.com>
Submitted by: "Martin Witzel" <MWITZEL@de.ibm.com> PR: #570