Fix for REGISTRY-2342
Merge pull request #102 from cnapagoda/release-4.3.0

Fix for REGISTRY-2342