Merge "Add timeout to subscriber data"