#gt-27 Fixed #gt-28 Fixed
Merge remote-tracking branch 'origin/master'