KULRICE-11623: Adding changes related to additive db update
Merge branch 'master' of https://github.com/mztaylor/rice-git