Protocol enhancements and refactoring.
Merge branch 'develop'

Merge 3.