Merge "Fix tunnelxconn template value"