Merge "rdbms: cleanup some type checks and documentation"