Merge "Replace deprecated wfMsg* calls with Message class calls."