Merge "Replace some wfMessage by ContextSource::msg"