Merge "Make group expanding nicer" into nyc-dev