OK, another merge conflict due to the Eclipse auto linter, do like that