CE-311 Refactoring messages missing wfMessage