Revert "Merge branch 'cfgUpdate2' into 'master'"

This reverts merge request !107
Status Job ID Name Coverage
  External
passed jenkins

passed jenkins