Looks good, but apparently it needs to be rebased again :)
I have done the rebase :)
Tested locally, works great, thanks! :)