I have done some minor corrections on the previous patch, discard it.
In attachment, the new version. No regression, no fixed.

-- 
Jerome.