GCP-6253 : Removed duplicate messages, improved logic