Merge from client_performance_session_fix