Merge branch 'dev' into 'master'

Dev See merge request !22
Status Job ID Name Coverage
  Refresh
manual #252612
civ_base allowed to fail manual
refresh
 
  Install
passed #252613
civ_base allowed to fail manual
install

00:22

 
  Package
passed #252614
civ_base manual
package

02:19

 
  Push
passed #252625
civ_base
push2021

01:00

passed #252615
civ_base
pushSolution

00:23

failed #252616
civ_base
push2021

00:02