Merge branch 'develop' into 'master'

Update master for 2.0.2

See merge request !1088
3 jobs for 2.0.2 in 9 minutes and 2 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Lint
passed #105505
lint

00:02:19

 
  Build
passed #105506
build

00:03:04

 
  Test
passed #105507
test

00:03:39