1.20.4
fix moving cert_file when password required, fix #1881
Merge branch 'hotfix/1.20.4' into stable