AI-499 : fixed regression (we should round number during row calculation)
Merge remote-tracking branch 'origin/version4' into version4