Back-ported fixes and improvements
Merge pull request #3110 from ggovi/new-conddb-fix-0-for-70X

Back-ported fixes and improvements