Making the private_semantic client ready for merge to devel