Applying fix for REGISTRY-2105