Revert "DeMerged branch 'feature1'"

This reverts commit b3140af10d1df83145d98b80550458aef4f2d9a8, reversing
changes made to e23e67fb448cc45fd433dc3a20ab3ec3ee6f0e71.