Merge "Factor the client/server Library Out" into rvc-qpr-dev