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

* V5-5-patches:
  swrun_*: snprint may have set a too long string length. Fix it if needed.