Merge "Fix tunnelxconn assign issues"