CE-311 Messages wfMsg to wfMEssage corrections