fix to handle "Message Too Large"
minor fix
reversed minor fix
Merge branch 'master' into CL-3142