Merge "Fixed a bug where the wrong group was HUNd" into nyc-dev