Merged 'dev'.
Merge branch 'origin/feature-dutscher-friendrequests-list'