As it is hard to combine patches one by one, suggest to apply a single patch and create a new minor release
Needs review
2.1
Code