Fix for bug #20098 - part 1