Merge "Set missing attribute self.server in _create_and_attach utility"