assigning to unit feature enabled back.
Merge pull request #2150 from ssushma/dev-branch

assigning to unit feature enabled back.