I think we can merge this, since the signature is definitely right, and if we can move the logic to core later, all the better.