Matt, this is being tested by the test you are doing with v3.0.5, so please resolve when you've noted it working.

Tested, marked as resolved, reassigned to Shane