#84 millions/thousands as source units
- sql changes
- logical changes
Merge remote-tracking branch 'origin/configurations-for-multiplications'