not yet merged though, I rebased and asked for review, maybe will land tomorrow