Link order fixed
Merge branch 'release/v18'

* release/v18:
  Link order fixed