Revert "Revert "Merge branch 'feature-1'""

This reverts commit 97c4478ef7d47d116b4665d9a0b8402198f9d66b.
removed feature 1