acu155327 Readd comment
Merge branch 'v6.0'

* v6.0:
  acu155327 Readd comment