Revert "DeMerged branch 'feature3'"

This reverts commit 17feb92a3ad0bf99cffafc37c2b4a884646c1603, reversing
changes made to d9658575071abd296122fcd1bbfbf0e40d6215d2.