FS-28 Client ServerConnector mis-merge fixes