Merge changes from topic 'binding-v3'

No match.