In 899fd7a, I wasn't able to backport the #525 Grizzly part, as code base is very different in master/2 and 1.9.

@oleksiys Just to let you know