fix invalid protocol buffer exception
Merge branch 'master' into logging