Merge branch 'release/8.4' into production
Fix error if user is not logged in
Merge branch 'hotfix/7.4.1'