fix
Merge branch 'hotfix/fix_bugs_in_wallet_template'