bug-fix
[rename] managers stuff
Merge remote-tracking branch 'upstream/master' into up