It would be great if you could put unrelated fixes / changes in different pull requests, so that we only have the actual selection stuff to discuss here.