Merge "Fixed a crash when dumping groupmanager" into nyc-dev