Revert "Revert "Merge branch 'feature1'""

This reverts commit 97c36d1ed8544a226d1647696ce7f78d3941b39b.
Better
Merge branch 'better-feature1'