Merge "Fixed notificaiton Stress Test" into nyc-dev