Note from C to A
Merge branch 'branch1'