What is the difference between this PR and #1693 ?
Since we already started the discussion there, I would much rather we keep it there.
Also, it seems to no include a commit I made, wrong pull --rebase?
Going to close this one
Pull-Request has been closed by pingou