@mklauser I think it's up to you whether you want these changes in there just now or not. Either is fine. Feel free to merge this as it is or remove those changes and then merge - whichever you prefer.

I think it looks good! Thanks for sorting this one out.