Merge "bugfix endfling case (bug 2300534)"