#gt-259 work 1h
#gt-259 fixed work 1h
Merge remote-tracking branch 'origin/master'