v1.0.9b4: Exploration to fix issue CONTRIB-4239
v1.0.9b4: Fix for issue CONTRIB-4239