Merge "rdbms: clean up and refactor ResultWrapper classes"