Adding fix for REGISTRY-2225