am bb09485b: Merge commit \'09564fbb\' into manualmerge

* commit 'bb09485bcb36a2d5cf4d7760bfd89807bb3be573':
  DO NOT MERGE Define Protocol class