CLOUD-146 refactored message setters