Merge branch 'dev' into 'master'

Dev See merge request !32
Status Job ID Name Coverage
  Refresh
manual #267847
civ_base allowed to fail manual
refresh
 
  Install
manual #267848
civ_base allowed to fail manual
install
 
  Package
manual #267849
civ_base manual
package
 
  Push
created #267851
civ_base
push2021
created #267850
civ_base
pushSolution