This is a follow up of the issue2186 and from the patch originally initiated by Rafael Fernandez Lopez. I hope we have cover all cases through the summary table added in the code. Regards. Gilles.