Merge branch 'branch3'
Merge branch 'master' into branch3