#gt-288 fixed work 6h
#gt-289 fixed work 10m
Merge remote-tracking branch 'origin/master'