Merge branch 'master' into trinity
Removed file copy to local node in butterfly
Merge branch 'trinity'