#gt-175 work 6h
#gt-175 fixed work 8h
Merge remote-tracking branch 'origin/master'