Correction orthog
Merge branch 'release-1.6.0' into release-1.6.1