Merge "CAS : Add missing converstion of message data"