Added check to exclude healthcheck messages
Merge Conflict