fix a booboo
Merge branch 'hotfix/3.6.9' into production