Merge branch 'master' into dev

Status Job ID Name Coverage
  Install
manual #186889
civ_base allowed to fail manual
install
 
  Package
passed #186890
civ_base manual
package

02:17

 
  Push Solution
passed #186891
civ_base
pushSolution

00:18

 
  Push2021
passed #186892
civ_base
push2021

00:49