Merge changes I49b683aa,Ib796dc6d

* changes:
  Fixed ref counting for returned rs objects
  Cleaned up ref counting destructor visitor