Hi Alvaro Pedraza, thanks for offering to help on this!

Keep in mind though that the master branch is currently `5.4` and this might be a breaking change for some, we should not apply this change unless we're sure this branch becomes 6 soon.