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

* V5-4-patches:
  pass_persist: zap possible CR at end of line.