Correct, this is independent. I just noticed that it would be best to improve this before #2493
Yes, it is ready to be merged, the code should not change anything in terms of behavior (except when weight is 0, which was not expected with algo 11), I did enough testing.
Thanks, I will merge it shortly.