Feature/3562 kafka

David Nicholsrequested to merge
feature/3562_kafka into develop

Merge request reports