Merge enable/disable; fix tests.
Fix merge conflicts.