BugId-99661: wfMsg* replaced by wfMessage
Merge branch 'consumer-sprint34-bugid-99661' into dev