merge
Data Manager.  Fix writing to 'active' on toggleAllFields.
Merge remote-tracking branch 'origin/develop' into develop