Merge branch 'revert-71375035' into 'master'

Revert "Merge branch 'devNew' into 'master'" See merge request !40
Status Job ID Name Coverage
  Refresh
manual #314877
civ_base allowed to fail manual
refresh
 
  Install
manual #314878
civ_base allowed to fail manual
install
 
  Package
manual #314879
civ_base manual
package
 
  Push
created #314881
civ_base
push2021
created #314880
civ_base
pushSolution