Shift Capacity points control from server to client
Merge remote-tracking branch 'origin/master'