RESTWS-422 Fixing issue with messages