Updating Clirr behavior
Fixed failing Jenkins build