Removed client-only references
Merge remote-tracking branch 'origin/16' into 16