adding changes to fix REGISTRY-2326