When I submitted this it was stand-alone. 

But I should have added a reference from this PR to the other one when it was submitted, so apologies..