@amohammadi @tiago.pereira
I would like to merge this branch before the release, do one of you care to have a look - or you can blindly trust me and the CI ;)