Merge "QS Edit: announce exit/entrance" into nyc-dev