Anibal, As far as I understand, you have the means to fix this already for 2.0. Could you please apply that fix already, and then think on how to package 2.2? I'm just asking this since #468060 is considered a Release Candidate bug, and it would be great to see this one fixed. Best regards, -- Marcos Marado