resplved issue SAT-1384,91,92,94,95,96,97,98
[remaining changes of the issue SAT-1384]