Applying fix for REGISTRY-2116