v1.0.9b4: Fix for issue CONTRIB-4239