Issue 3545

Can we pull this to test so I can get it working on test.

I keep on having to put it back on beta so getting it merged in would be nice, even if we don't link to it immediately