fix even more issues with avatars

added 7 commits

• c6e0dcf0...0147226b - 6 commits from branch develop
• a253c951 - Merge branch 'develop' into 'fix-avatars2'

Compare with previous version

enabled an automatic merge when the pipeline for a253c951 succeeds

merged

mentioned in commit 96691987