Merge branch 'feature_server_management'