remove func parameter in state
Merge commit '3e4990d93ceb5e2f4a3d86ac95f0b9406a25ad24' into PDP