v2.6.2
Merge branch 'release/2.6.2' into develop

* release/2.6.2:
  v2.6.2