@rafaelfranca This was the only conflict, do we not backport `CHANGELOG` entries?