#gt-284 Fixed work 2h more features
Merge remote-tracking branch 'origin/master'