I finally got my way through forth and to the point where I have a working patch; updated ticket with patch and included the testing I had completed. 2 line patch, should be very straightforward to someone familiar with that code. Thanks