liks fix
Merge branch 'hotfix-3.4.5'