can set account as favorite without explicitly adding it first
Merge branch 'master' into develop