Merge branch 'dev' into 'master'

Dev See merge request !30
Status Job ID Name Coverage
  Refresh
manual #264785
civ_base allowed to fail manual
refresh
 
  Install
manual #264786
civ_base allowed to fail manual
install
 
  Package
passed #264787
civ_base manual
package

07:16

 
  Push
passed #264789
civ_base
push2021

01:28

passed #264788
civ_base
pushSolution

00:30