Merge "Can now indicate the desired number of notifications (sub-buffers)" into nyc-dev