Support Grizzly provider, close #1269