CR-IC-2986 MessageBuilder