Merge branch 'fedexist-kafka-timestamp'