Signed-off-by: Bert Wesarg <bert.wesarg@tu-dresden.de> (cherry picked from commit 18525ce39be78ea695ce51c64a6eb443a2dbd899)