If we need to clarify this more or change for 2.5, I'll leave it for then so we can merge this :)