Merge branch 'fix/client-goals' into 'develop'

Fix/client goals

See merge request !1287
5 jobs for develop in 15 minutes and 39 seconds (queued for 4 seconds)