Comment 2 for bug 1998184

I prepared and linked a set of changes to hint the current version as badtest.
Please consider merging them as this version will be broken permanently until a new upload will fix this issue.