adding changes for REGISTRY-2326