Server-side: base currency fix
Merge remote-tracking branch 'origin/docs' into docs