Merge branch 'dev' into 'master'

Dev See merge request !21
Status Job ID Name Coverage
  Refresh
manual #247829
civ_base allowed to fail manual
refresh
 
  Install
manual #247830
civ_base allowed to fail manual
install
 
  Package
passed #247831
civ_base manual
package

02:15

 
  Push
passed #247859
civ_base
push2021

01:44

passed #247832
civ_base
pushSolution

00:24

failed #247833
civ_base
push2021

00:02