3348927 reviewed by Björn Kahlert and Stefan Rossbach
3423046 reviewed by Norman Warnatsch and Stefan Rossbach

Also added JUnit Test case (not reviewed yet)