Merge branch 'dev' into 'master'

Dev See merge request !31
Status Job ID Name Coverage
  Refresh
manual #266077
civ_base allowed to fail manual
refresh
 
  Install
manual #266078
civ_base allowed to fail manual
install
 
  Package
manual #266079
civ_base manual
package
 
  Push
created #266081
civ_base
push2021
created #266080
civ_base
pushSolution