Merge "Add SessionInfo force-use flag"