Merge "Fixed a bug where the expandhelper was expanding to quickly" into nyc-dev