Merge "Fixed a bug with public notifications" into nyc-dev