Late fixes

6 jobs for !84 with feature/userPage in 4 minutes and 35 seconds (queued for 1 second)
merge request