change in enable disable functionality
Merge branch 'from_june_12' of https://github.com/dputtannaiah/rvidi into from_june_12