#gt-215 Fixed work 1h
Merge remote-tracking branch 'origin/master'