I think we should move this patch to the next CF as I believe that work is still going on resolving the last reported bug.