CLOUD-216 modified messages