v1.0.9b2: Fix for issue CONTRIB-4137