Merge "record the last event received regardless of having clients or not" into gingerbread