#gt-278 fixed work 20m
#gt-279 fixed work 20m
Merge remote-tracking branch 'origin/master'