Hi Paul Wright - can we merge this? I've reintroduced code that was already reviewed by Eng. For more info, see #694 (comment)