synchronization with beta branch
ApiServerImplementation contructor
synchronization with beta branch