[Merge][Server] Merge fix pr to dev (#508)