reduce protocol callsite overhead
Merge branch 'master' into dunaj