#gt-283 Fixed work 2h30m
Merge remote-tracking branch 'origin/master'