LL-761 #time 2h 30m Cloudn't test because I couldn't obtain a token
Merge branch 'develop' into Chocoloper-LL-761
Changed just little things
Merge branch 'Chocoloper-LL-761' into develop