Transferred an enhancement by Mark Olesen from our development line to 1.6.x to resolve