Merge "Fixed server crash on empty client payload"