Merge branch 'Story_19889_Database_Modenization'
Merge branch 'origin/master'