This will be automatically fixed if the branch is rebased onto latest master, where this change is already implemented