Karel Maesen, I don't see this committed to master. I'm closing this issue in preparation for releasing 5.0.10 and 5.1.1. If this needs to be pushed to master for 5.2.2, then please do so and add 5.2.2 as a fix version.