> This is based on v5 of Fady's work. > I've reworked a bit to minimize the number of changed lines, > and did some rewording. Applied quickly as it is waited for long, in the hope I didn't introduce a regression in this v6 :)