Depart Manager

Depart Manager
Merge remote-tracking branch 'origin/maptest' into hack