I'll create a new PR as there would be conflicts anyway.