Remove addEntry from Acmanager
Merge origin/master