Merge remote branch 'origin/HH-38779' into release-candidate
release 2.18.6