Merge branch 'client-fixes-and-refactoring' into 'develop'

Small fix & refactoring in client

See merge request !117
4 jobs for develop in 15 minutes and 25 seconds (queued for 6 minutes and 7 seconds)