Make ResultSet a new-style class.
Current metrics now use resource pool.
Merge branch 'rp-metrics' into develop