Copy of server bits commit

Copy of server bits commit