Merge branch 'develop' into 'master'

Merge FinalVersion to Master

See merge request !2
Status Job ID Name Coverage
  Build
canceled #2167
build

 
  Test
canceled #2169
allowed to fail
code_quality

canceled #2168
test