Sounds good, I merged.
Don't like too much the bitbucket pipelines since the last time they created
automatically a commit without asking for permission just to trigger the whole
thing :-) But ran the tests locally.
There is not much to review here. If everything compiles and the tests pass, I
think this can be merged. You can enable pipelines in your bitbucket account and
some tests will be run automatically for your commits.