Gemstone 24 dev - Issue #72 fixes

Integrate Issue #72 fixes into gemstone2.4 branch