remove reference to baby
Merge branch 'hotfix/3.6.5' into production