Server-side: new amount table filling logic
Merge remote-tracking branch 'origin/dev' into dev