@ekaitz_zarraga

When in doubt, I always write down the issue I'm going to address in the issue tracker and then name the branch after the issue id.

(as a policy at work, we also always start a commit message with the related issue ids: on long term, plury-annual projects it's a valuable debugging tool during bisection, to really understand why a change was introduced)