Merge "Fix remaining .rs.dtor() issue for RS."