Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev