Merge remote-tracking branch 'origin/master' into O_Morozova
Merge branch 'O_Morozova' of https://github.com/olga-jane/prizm into O_Morozova
Merge remote-tracking branch 'origin/master' into O_Morozova
Merge remote-tracking branch 'origin/master' into O_Morozova
Update recalculation for Pipe weight
Merge remote-tracking branch 'origin/master' into O_Morozova
Merge pull request #609 from olga-jane/O_Morozova

update Pipe weight recalculation