Added trustees and securityLevel right for testing
Merge origin/master