fix tests
Fix handler isEnabled NPE in e4
Merge remote-tracking branch 'origin/master' into DataManagement