Merge "Attach timestamp to ringbuffer generated files"