no need to encode as its a payload
Merge branch 'master' into 2.5.x