Merge branch 'V5-5-patches' into V5-6-patches

* V5-5-patches:
  fix #2482 snmp response: Too long