Merge pull request #3384 from HolgerJeromin/patch-1