Merge pull request #1699 from tokkee/sh/grpc