Merge changes from topic 'protocol-framework'