Merge "rdbms: reorganize Database fields and constants"