Merge "Add wfDeprecated to wfMsg* methods from 1.21 on"