Merge "Remove wfCheckLimits"