#gt-118 In Progress work 1h30m
#gt-118 Fixed work 1h20m
Merge remote-tracking branch 'origin/master'