@sjmachin - can you review this particular change please? I don't know what the implications are here...