Merge branch 'dev' into 'master'

Dev See merge request !14
Status Job ID Name Coverage
  Refresh
manual #196855
civ_base allowed to fail manual
refresh
 
  Install
passed #196856
civ_base allowed to fail manual
install

00:20

 
  Package
passed #196857
civ_base manual
package

02:30

 
  Push
passed #196859
civ_base
push2021

00:50

passed #196858
civ_base
pushSolution

00:23