Merge changes for Connector with David