Adding session_id see BT#4704