Applied patch #102205 + some extra code to fix bug #121006.