Merge "Add session ID to WPP logging" into main