Ah, I forgot about global features, thanks for digging this up. Let's wait for @rbrusu if he wants to comment on this, otherwise I'm fine with merging.