fix npe
fix test actor filter edition
Merge remote-tracking branch 'origin/master' into DataManagement