(BugID: 97893) Clearing "disabled" does not undisable
Merge branch 'bugid-97893' into dev