@haystack Please review when you have a moment. You have maintainer privleges on my branch so you can edit and push directly
mentioned in commit 5801333e
merged