Revert "Revert "Merge branch 'branch1'""

This reverts commit 605c4dfe3599d69d55871c378f6b7efd24f9f356.