Merge "Fixed a bug where notifications could become orphaned" into nyc-dev