Merge branch 'dev' into 'master'

Dev See merge request !11
Status Job ID Name Coverage
  Install
manual #190255
civ_base allowed to fail manual
install
 
  Package
passed #190256
civ_base manual
package

02:23

 
  Push Solution
passed #190257
civ_base
pushSolution

00:26

 
  Push2021
passed #190258
civ_base
push2021

01:12