Merge "Enhanced notification details." into nyc-dev