CONNECT-1368: More updates