Merge branch 'devNew' into 'master'

# Conflicts: # package.json
Status Job ID Name Coverage
  Refresh
manual #314869
civ_base allowed to fail manual
refresh
 
  Install
manual #314870
civ_base allowed to fail manual
install
 
  Package
manual #314871
civ_base manual
package
 
  Push
created #314873
civ_base
push2021
created #314872
civ_base
pushSolution