MAESTRO-2790 Renamed aggregate to buffer and removed the 35 count in favor of 'every 2 seconds is fine'