Merge "Fix build caused by "bool connect""