Merge "Check if getSystemSessionInfo requested by a Proxy Router" into main