adding fixes for REGISTRY-2324